Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 18 Aug 2010 07:43:30 +0000 (07:43 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 18 Aug 2010 07:43:30 +0000 (07:43 +0000)

Trivial merge